Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 22 Apr 2010 07:53:53 +0000 (07:53 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 22 Apr 2010 07:53:53 +0000 (07:53 +0000)

Trivial merge